local changes
fixed merge conflicts
added compass with 1500eV
added circular compass inputs
added circular compass inputs