Fixed a bunch of bugs. Still broken on moving.