Bunch of changes including recordings for both

iPhone and android recording compatible