jewel: cleanup and update