some fixes, added reset button