Add comments, remove wrong asserts