Fixes minor variable name bugs; clarifies comments a bit