Merge pull request #682 from mcmonkey4eva/master

Pull request for slimey stuff
Merge pull request #685 from mcmonkey4eva/master

Pull request for simple tags and fixes