backend and fronend fixes