Better diagnostics, clear cruft, make more clear