updating remaining items
updated prefix routing to work with 4.1
Merge branch 'feature/update' into develop
Merge branch 'develop'