Fixed some things
Fixing flicking.