Cleanup and reduce size, new ability to upload via gdb.