a bunch of minor fixes, ready to strip it off the topcoat