Added additional comments
Final fixes and tests