fixed some things and please no merge conflicts Gods of Git!