Fixed more important things