Fixed comments. Merged with current version.