some repairing in code. Few additions.