Minor fixes

Improved documentation and fixed some imports.