index page and some cleaning up