bringing over changes from live server, sorting out git issues