fixed issues with hard coded dev values