More Minor Changes - Second Beta

Also added some comments