Renamed base module.
Some more refactoring.
Added test for criterion suggestion for kwarg.
Added fix for the above.
Fixed brought on by manual testing.