Fixed factories

Cleaned up .gitignore / removed some junk from repo