Fix more stuff, add code