- minor bug fixes;
- remove useless imports.