Bug fix for new settings syntax and improvements