Further rewrites
Fixed paralellism, and fixed bugs preventing new items to be added