Bit more commenting, few other changes but nothing massive

Signed-off-by: Sam Hellawell <sshellawell@gmail.com>