Misc refinements

Please feel free to deny, or ask questions :)