moar fixes (almost working)