Add some asserts and update comments
2 files changed