Fixed even more bugs...
More bugs