Modified gitignore
Some more exception handling and corner case management.