reset button working and small tweeks