Whole lotta tweaks thanks to alberto