Lots of changes added a few more tracks