fix some introspections, coding style