iOS- Fixed first-run error which would result in black screen. And small fixes/improvements