Some real-world testing and tweaks