small tweaks to thinking modular