add more asserts, debug helpers..