Fixed a weird glitch and rearranged stuff