+headlights & minor fixes