initial feedback fixes