removed assumption that settings values would be numbers. cleaned up the code some...