Additional updates and things