more figaro tweaking