[WIP] Some improvements

| Q             | A
| ------------- | ---
| Fixed tickets | #182
| License       | MIT