some fancynes improvements