clean up, tweak controls