Fixed even more bugs