Fix way more bugs.