last commit before rework to use JSP EL - some fixes that accumulated over time - to preserve, just in case...