Lot of tweaks