various SWORD cleanup and todos