WIP: Fixed bugs, etc.