jyl bug fixes & improvements