Fixing some more perf and style issue
Merge branch 'develop' into captainsmode
Some Lua Analyzer Comments