jh - fixed some bugs of I created