Add more problems

Also change output base on class name in description.