many fixes + frontend adjustments