Mega-update, now with less suck