Bugfixes in arrange and names fixing.