fixed high priority bugs, but need to fix flicker
changed some name stuff