working on error checking in the backend
fixed urls
Merge remote-tracking branch 'origin/fixUrl' into develop