fixed and removed a few things