some moar fixes