Fixed more errors and stuff