small fixes & improvements