Put todo/fixme comments into master