misc update & bug fixing