Cleanup and add some accepted base addressed