switching to develop
switching to develop again, temp. fixes made