minor fix, improved doc etc