fixed known outstanding bugs. -b make still untested