updates for issues #471 #562 #569