Frontend

fixes #6 #5 #2