fixed comments in source and minor changes