Clean Up. Ready for release :)
- Fix some weird scenarios where tag is reset.
No release notes available