Final touch ups
Adding ServletContext