misc update/enhance/bug fixing