Error Fixes

Tools for this section are on the way.