some progress
tweaks