Fixes for comments

Overall looks good! Some changes (mostly to undo stuff from the example repo that aren't needed yet and were causing some bombs). Take a look over the PR diff and make sure you understand what got changed and why. Then go ahead and merge it in, pull down and you'll be good to go!