More work done a bit everywhere...still lots to do