updated controls. works much better now