comments and variable name changes. going to rebase eventually...