update to 2.17.96 TODO remove personal shortcuts/additions