fixed many of the issues in new assertion architecture.