added listing numbering, changed listing name, changed figure name prefix