Added reset and minor updates