Improvements & bug fixes