A number of improvements & bug fixes