Bug fixes
Bug and feature fixes
Add resetting