3.1.1 additional bug fixes