incremental; corrected names, minor code cleanup