cleanup
Merge branch 'fscheme-improvements' of https://github.com/ikeough/Dynamo into fscheme-improvements