Some fixes and a bit of tidy.
1.0.2