*fixed some issues