Switched to long licence Some general checkstyle fixing Removed unused ErrorHandler (readd when we know what to do with it)