Some testing and tweaking