wrong rearrangement fixes
misleading comments fixed