update the error layout
pull the ja out and refactor the logic
Merge pull request #38 from jeremyBass/master

minor updates