Various moves, sorts and edits