Ib tidyup 3 july

One commit to synch