Health care overhaul proposals take shape