sync with maximes changes / improvements to the fiq.