finishing improvements in backend