More Optionals.
Re-add public headers. Sometimes Xcode can't find them?