More parallelization
Fixed an NPE
Fixed the bouncing-around issue
Test driver for another layout