Some bug fixes, added Tag api. Add tag should work, might not be bug
free yet