more
cosmetic and comments
Merge branch 'master' into sauerbraten