minor bug fixes and more tags