adds NSNumber handling
adds additional unit tests
Minor changes.