Minor improvements & bump version