Added macex, fixed some exceptions