fixed merged errors, added core of mqubed