few changes following suggestions on irc #iphonedev