better control-buttons, cleanup, comments
small changes