Wk2P4 finally tweaks