Lot's of fixes/tweaks. More to come too!