bug fixes, now passes check-all
Merge branch '23-more-dotcode' into 24