added a few controls, some small improvements