Git changes, tidy ups and experimenting with impromptu