merged the SuperContract annotation into the Contract annotation and fixed some bugs that came up through the merge