Structural changes made and some bugs fixed.