class map
minor message improvements