a bunch of stuff...  unorganized changes...