Actually squashed those bugs, works now