“API” implemented
+ general improvements