final stuff
Prepare for assignment 7 -- some changes to help things work with tomcat