make more variables const in order to help the compiler
remove comments that do no longer apply