fixed some places