Added back some changes without a bug. Hopefully the re-scaling and the adaptive time-stepping now work on parallel