made some improvements in the jsps (#63, #38, #31)