modify details and bugs