Added some more compliments and tweaked some timings