Fixed quantity not being updated

Fixed quantity issues on swap() and saving other info as well on the subscription creation