update for iPhone 5 and some fixes