Cleaned up startup.
Fixed pagination on pp pages.