Some bit more of polishing, renamed parallel in async, removed unused settings