Improved economy and worldguard support a bit

Fixes quite a few bugs as well