updated & fixes to 3.16-3.18