fixes pagination prettiness
fixes capitalization problem
almost at 90% coverage