added sonar update
cleaned up code slightly
added onquad and planegun ifdefs