Lot's of tweaks