Fixed more bugs!