fixed minor things
Fixed more just about good
Should be all fixed