minor changes to control