Frontend workflow part2

Some bugs, some improvements for 6.2