Add keywords, cleanup exception messages and code.