#119 Minor updates