MOAR fixes, plus stuff.