Multiple fixes and improvements, started to work on billing and shipping address support