berksify and fix sort/map order