Drone Improvements - Take 2 PR Boogaloo

Too much stuff to comment individually, Check the file changes :)

On merging: Take whatever date Github says the PR opened on and add 1 day, due to PR issues.

FIXES THE MASTER CONTROLLER WOOP WOOP.

fixes #4893