changed various things... I guess