Various updates to my fork

?