added comments and more settings\!