updated controls and some more cleanup