arrangement issues fixed, hopefully