Adding more payment options and fixing bugs