various fixes, the cakefest update