Fixed the bug, probably some minor changes as well