fixed some like bugs