smaller fixes, why did i never commit?
blah, mergfix