Some updates in comments etc
Deleting junk files