Work on new shader system

- Fixed some contract errors