Tiny Changes

Tiny additions, changes, tests, modifications.