more cleanup and adding a ribbon