Add better error handling, verbosity