minor fixes & performance