moar fixes, only one failing test left )