Cleanup and additions

Signed-off-by: Justin Wiblin <Justin_wiblin@hotmail.co.uk>