upgrades for Xcode 5, breaks backwards compatibility due to @module; minor edits to fix warnings