tweaks, stalled still not perfect