Now coded towards Android API level 8. (Android SDK 2.2)
Also some cleanup done.