Fixed Some stuff
General Commit