more changes! almost fixed.