Fixed Small issues
Merge branch 'master' into WebappModel
Refactored and changed responses abit.