Code clean-up, plus consolidation of manifest changes.
This includes preferring the app to be loaded on the SD card.