added sone TODO fixes