fixed up some control issues