cp2k tweaks, ref fix.