various fixes from insight
fix cs
Merge pull request #479 from lunika/fixes

various fixes from insight