Misc. cleanup, fix visual bug with current track