changed admin to develop
code review & cleanup
fixed merge conflicts