IDI-118: Made edits as per acheetham's feedback. Also fixed some minor issues with existing content.