Minor updates. Removed commenting ability.