small refactoring
add validation of a track
fix bug