Backend updates

Cleaning up after myself.