fixes for beaver dam (issue #30), florist (issue #25)