fixed #813 and cutext confirmation fixes