frontend + fixes