demo page added and bug fixs