updates made per the update in the GlimmpseiPhone project