bug-fixing and config data manipulation
added the comments