Fix tar invocation
clean up some more