Code Fixes

Helper functions extracted improperly.  Return address was refactored as
0x12 (18) instead of the proper 0x0C (12). Will no longer code
uncaffinated and not run unit test before committing a build.