Version D and E added. Bug fixes.