Adding some stuff, fixing errors