fixing some issues in the scan chore and more visual details