Fixed issues with TPA, added enhanced orb support (required a bit of a
revamp, np)
Fixed a few things, tested everything, all OK