Some fixes!!! Still crashes sometimes, but back and forth now works