Fixed more stuff
Modified stuff