Fixed bugs and added controll...