Some fixes and Clean Up
more fixes
more..