FIXME in Milestones
Spelling in risks
Updates from Zoltan