Updated todo
XSDL: Fixed Lollipop troubles