tweaks and disabling reversing for now