tweaked some various stuff