Fixed some casing and such