moar fixes
Changes