Swap distance now added, removed some warnings