misc. tweaks - quick commit