builder fix, frontend stuff