Some updates to stuff