numerous adjustments, dev dots removed