more ttle fixes, and further plan content
Merge branch 'staging'