fixed some things for kirk