imported more pieces from the original xar and cleaned them up