testing, UI & refactoring