tweaked a few things