tweaked a lot of minor stuff