fixed two remaining problems