Tweaks, start proper analysis
Clean up ideas