further bug tweaks