some minor fixes & improvements