small tweaks/testing w/ Timo