bugfixing
working on admin