fixed some bugs
Merge branch 'oop-refactor' of https://github.com/paylogic/trello_workon into oop-refactor