Fix more syntax and stuff to get it running