tags changes and bugfixes, #36, #26