Better error reporting
Major bug fixes
Updated gitignore