fixed logistics and did a first cleanup pass