bugs fixed dictionary added