rename JAD to FAD, and clean up