Added stuff to results, lot of tweaks