update, moving some things to track from song. and more constraints