fixing errors
merged frontend + backend