cleaning up
Various changes, stopped working to fix critical bug on backend updates