fixkitchen: massive code overhaul