add more obs fields; cleanup