Fixes and some Additions. Remove E- and PJOURNAL classes