round 2 of front and backend updates