More minor tidy ups and doco updates.