changed various things