Fixed a glitch and added some stuff