merge of latest curlymoo changes