Fixes

Fixed a bunch of null errors, and logic issues. As well as an issue with
TagAPI.