A lot more clean-up and syntax checking. Me fairly happy now.