Little cleanup and polish. Working on pagination, not complete and commented out.