Cleaned up files and added some error statements
Merge neil-parse