fixes and backend final