Small tweaks, mainly revert to regular engine v1 for performance