Read from separate drive file, other minor updates