moar and moar fixes