Don't quote let lambda, use n for number
Minor cleanup
Point marker nowhere
Merge branch 'develop'