Minor fixes to trigger and RPM calcs code. Should be 100% working