fixed .gitignore, code cleanups