capitalized action names; misc fixes; added TODOs