fixes & improvements