Some updates, should be good to go