stuff worked on, added main page