Made a few updates, fixed a few bugs