Bug fixes, refactor