minor fixes & improvements