latest bug fixes and tool tweaks