Fixed moar stuff