updated controls and other stuff