Bug fixes and refactors