Fixed more stuff....