added some things to drone header, and moved defines