Documentation and few new assertions