Some stuff
Various updates