added some details and bugs