UPdating some comments and docs