Did some directory sorting, fixed the position identifiers