Updated

Comments inserted, asserts fixed, all passed so far.