some code and docs improvemets