Clean up, fix numbers, fix bulbs