Some further documentation and minor tweaks