Small tweaks and commented out NSLogs