Various fixes, first pass acceptance testing