~ minor change
* many improvements