improvements and tweaks