clean up oswalk, add more comments