bugfix updates after testing on ios