updated some bug fixes
fixed url bugs
Merge branch 'develop'