5.4.06.99

Fixed more bugs. Tweaked more default unit settings