Increased targetSdk to 18; some formatting changes.