More fixes and updates

Author His Dad <John@hisdad.org>
Author date 2015-03-10 22:20:08
Author local date 2015-03-11 11:20:08 +1300
Committer His Dad <John@hisdad.org>
Committer date 2015-03-10 22:20:08
Committer local date 2015-03-11 11:20:08 +1300
Commit a36235a11b68b65ad9c8a2be002631e050aca9f8
Tree d01575aa6881f947bf5ca0d09f976d59e5a360fd
Parent ee8909ad3d0362720ae31c8afe6d906b28411f19
More fixes and updates