Merged bugfix from Marcello and removed some more SHANCHEN ifdefs
Missing guard
Fixed typo
Fixed S
Made set_rho available
Another fix
Updated mpich