update to 2.1.6 and additional changes