Added the problem count indicator, did other minor cleanup.