Refactor, bug fixes, testing