baking

fixed files from merge and baked