fixed some areas