Rich

Fixed a bunch of consistency bugs