Soem refactoring, add EnvFile reader
Some more fixes to wrappers, implement EnvFile