Fixes to contract inner workings
Fixed a MASSIVE conflict