Fix default settings
Comments for deprecated later functions