Fixed up a couple //TODO issues