Misc polish

Small bits and pieces all over to improve the current state of things.