More verbosity and bug fixes