more clean-up. commiting piece by piece because of merge conflicts. hope
it's
ok:)