backend changes and other fixes