Last changes

Slightly corrected comments. Applied Joern's changes in my branch.