Fixes trig and adds fiducials in all constructors