bug-fixes, and added tags.