minor fixes (still lots of problems)