Removed some older code.
Multiple errors method for NSError
Changes to file organization