This version has the correct constructors

I used the wrong convention on the constructors, so I updated the
constructors, and corrected the issue with the check functions.