Modified 2 Images, Improved ImageServlet, minor changes