last minute fixes.

build.prop merge and edit