first post-break commit, updated min API to 11
fixed the inconsistency problems with the naming of the stored location