Intermediate checkin for Issue #149 and others