Get rid of etrack switch, combine with track
Fix burrow cursor bug