Added some stuff, fixed some stuff