Fixes, cleanups, improve exception handling and user messages.

And also, Arquillian added.