Structural fix

Some Structural fixes
Some Bug fixes
Comments Added