Minor fixes all over the place

I think it might be a better idea to restart this whole thing...