some fixes from yesterday that have been running and seem to work, fixes #93