restructured fnordlicht stuff