Changed a bunch of things according to Nurupo's suggestions