Extended the error scheme to be more intuitive.  Changed minor
pathing issues at the same time.