pulling in minor changes from develop