fixed some control issues