Fixes & improvements