WK-445 Typo corrected
WK-445 Added todos