made everything simpler and fixed some bugs
updated gitignore