General cleanup, started work easing artoo use