Infinite recursion fix and additional system configuration wording