added description mapping, highlighted issues