Glitch fixed, code durastically cleaned up