fixed little bugs for testing