backend changes and fixes