Cleaned up code, balance tweaks