Fixed misc. warnings + added some Review TODOs. Commented out unused variables.