Assembly and Dismantle updated. Source and CoreObject minor fixes