small changes + cleaning up a bit
rm obsolete file
merge into master

Merge branch 'philipp'