Updated extends / implements
Fixed comments breaking everything
Update Primitive Type methods

... to have the correct return types.