Updates and cleanups

@jcredding more of the same.  Just cleaning house.  This one included an upgrade to assert 2.0.