lots of design tweaks to the backend