committing latest changes.
adding some more settings