Made a few updates, more to come