Working ingredients and unit_analyzer bugs fixed