Cleanup...
Add some data.
Make case-insensitive