backport corrections/additions from Coding Serbia