Comments fixed and tested #99