all done, only frontend fixes left