Added reset
Fixed some things