Minor tweaks, some documentation