Various fixes and additions while at home