minor fixes (still trying something)