minor buges fixed again