Fixed issue #37
fixed issue #35
Fixed issue #34
minor fix
Merge pull request #38 from symfonyse/insight-fixes

Insight fixes