Bug fixed and more cleanup