more tests and less compiler warnings.  :)