small fixes & added iOS version