Monday commit

Various improvements