Some more comments
Updated for XCode 6.1