Tidied up documentation + verbose mode