Doku added
Minor Bug fixes