Cleanups, fixes and got Autogun finally working