more formatting and cookbook migration fixes