further cleanups
ignore .idea files
Merge branch 'master' into cleanups