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