Final testing and tweaking