moar stuff plus fix