Modified enumerate to be lightning fast
Fixed crash with configuration display