fixes formatting; adds extra defense about features/measurements