Feature/add issues with track data

Do not use semicolons to terminate expressions.