reworked some asserts