Added some stuff, made some changes