added reset feature, minor updates/fixes