jstl improvements and adjustments for release