Fixed even more bugs :(