Glitch Weekend

Fixed multiple glitchs