re-tweaked some values