fixed some this and thats