Fixes & improvements.