Improvements & fixes.