- refactor + bugfixing