fix some introspections, coding style
Merge pull request #652 from havvg/master

fix some introspections