bug fixes + reset button added