small fixes (matlab still does not work)