commiting latest changes from dev. eway, one page checkout, many other mods