More updates + cleaning up the page

not quite done yet