tweaks
updating logistics
merged