Final commit before release

Fixed issues with Sproc-mapping and corrected some error message
problems.