Updated to xccode format and added a few more