reworked some flow and started sti for froms
fixed merge conflicts