polishing, verbosity and edge case handling