Added Tar and some cleanup