albert&harry

merge harry & albert fixes