Fixed more bugs and refactored