Additions for Hue Hang

Implementation of recommended contract revisions