fixing stuff
frontend done