Fix move on same partition, fix options saving/loading