Finished Cond, Or, And, general fixes
gitignore change