comments and minor changes
todos