Controls + Bugfix