Fix encoding
Add commenting to Executor
Fixed problem with function calls