Several fancysmancy updates