added a couple of TODO comments
merged TODO