fixed a whole bunch of stuff along with balance changes
Merge branch 'dev' of github.com:drpotato/pigvane into dev