removed some files from git tracking
abort conditions updated