include some minor updates that arrised while working with JTC