*Some general fix ups.
*Made xml files readable in Android