Fix code sections + better iPhone support