Remove some obsolete comments, add comments etc