Made several Plan J improvements.