fixing moar & moar stuff