Fixed Some things and added things aswell