final evaluation + minor jsp modification