A lot of post processing fixes and small interface changes