fixed moar stuff