minor changes, need work on backend