other tunings + fixes from @ratrun for #190