added gitignore, and made fixes recommended by Marc