added todo re complaining about unknown keywords
corrected examples