Some stuff updated