Added support for the 'step' button + bugfixes