Bugs fixed; Added core.contract