adjustments
Merge branch 'master' of github.com:pianolab/spaghetti-base