config changes, various functionality updates and improvements