final build before hiatus other than the obvious bugfixes