made vprince edits, code edits -- not formatting, and indents