Some fixes as usual

I need to proof read more!