Merged TrackBase-Hitpattern-Redesign-no-pull from repository JuantAldea
Fixed a couple of errors