Better error handling.
Added comment and keyword display