- structures improved
- constructors fixed for #17