some changes & fixes for Xcode 4.2/iOS5

check out my changes, you might be interested.