improved error handling
added some ignores
merged