minor buges fixed