Additional methods, bugfixing, refactoring.