And clean up the bugs I introduced while mucking with sgran's shell