Ramdon small fixes or improvements

| Q             | A
| ------------- | ---
| Fixed tickets | #220, #221, #222
| License       | MIT