Jsp cleanup, doc update