added a few tweaks for classes and logistics.