Various updates 22/13

Various updates 22/13