Some asserts & comment fixes
merge