fixed major iOS 8 issues, updated headers, minor refactor + reorganize