Make Aditya's edits (Closes #1) and minor changes