Moar fixes and additions