Small fixes and new controls