some tiny tests + minor changes