Mostly fixed everything the handle switch broke