- finished position handling
- minro refactor changes to C# code