Gitignore
Bunch of fixes and Form A