bug fix
update many details