minor updates
trying to fix merge problems