fixing bugs, making things work with new version

I think iOS is pretty much done