Cleaned up comments, added a track