State service

Fixed comments for settings and state service initializations.