Small fixes, some cleanup.
Bump up number of local cores to 4.