JSPs almost complete, lots of bugfixes and enhancements