Fix Controoler
Fix controller bugs