Some updates and stuff