fixing minor errors (startlights) after merge