#65 improvements

Various improvements