tweaked the way a few things work