Added tar, some fixes