Added commenting and added miscellaneous updates