Some more docs and comments