Better fixes for consistent memory per machine rather than core. Avoid double scaling mistakes and avoid slurm specific kludges