Fixed markup and added last info