cleanup headers, fix compile
update .gitignore