MAL-86 | Add flex to tider and some fixes from review