Minor updates (?), main() commented out.