fix cosmetics & bug