CFY-1313 various improvements