More improvements and tweaks