some fixes all over classes and jsps