fixing moar stuff