Minor changes
Removes extra comments
Adds comments where fcns could be improved
Minor changes