fix bugs and add thing which needed