solved two issues from earlier merges