Improvements & fixes