Added some documentation to settings and small fixes

Added some documentation to settings and small fixes