added more goodies for code analysis