* fixed little bugs