updated gitignore, fixed bugs, added main