Parallel 2.1

Small fixes
Fixed checkstyle