Major update in backend and frontend

fixes #3 #5 #15