Cleaned up a bunch of files, fixed a bug with nprocs not being checked.
Actually fixed the nprocs bug.