Functional fixes/cleanup

Same for this? Remove commented out html.