Minor fixes & improvements.