Final fixes + descriptive comments