Further small improvents and tweaks