minor improvement to CustomSettings class, some fixes