Few bits and bobs

completed