some improves and update docs