some more tweaking. still only so-so