cleanup and warning fixes

additional cleanup
.gitignore fixed