tweaked various stuff