minor app changes.
fix merge.