some coding style changes
android image and sound gen may work