fixed some staff