tweaked a few things, but no major changes