Revert "commit some comments and fixes"

This reverts commit bdc1aff6e6c9c05be1201460d82f4283e6db8e35.