email hanler, more cleanup, better page buttons
forgot to add