adds, fixes