Updated things to 1.5.2 and fixed moar stuff