Cleaned up tar handling
Moar jsr305