target API version 17
bug fixes
whitespace tweak