Various Changes

Re-did a lot of things