other code tweaks